Cleaning Up of Code