Code Cleanup no.2