Cleaning Up Some Code