Clean Up of Code and Comments