Cleaning Up the Code