Sort out some comments
Sort out some comments / tidy up variable names