Cleaning up code!