Merge "Style fix"