Physics class tidy-up