Cleaning up the Code