Code Cleanup: Style