Code Clean Up 2