tidy + comments