code tidy/review