Code style cleanup
Merged in code style cleanup with conflict fix