Clean Up Of Code