Post code review tidy