Starts cleaning up code