tidying after code review