Removing comments, tidying up