code review tidyups