Style changes
Merge fix