committing some style changes
Merge fix