Comments, tidying up