Cleaning up some code...