minor code review: just tidying