Small update/tidy-up