Cleaning up the code...