Tidy-up
Changes from code review