Cleaning up code..