more tidy up + comments