Clean up some code...