commments and cleanup