tidy up + comments