commments, tidying