Code Cleanup 1/2