Code tidy-up...