Tidying up some comments and removing redundant code