Code Cleanup: Style
Code Cleanup: Style