Coding Style cleanup