Let's clean up that code!