Cleaning up and tightening the screws