Code Cleanup 1