Cleaning up comments etc