Comments and tidy up