Trivial tidy up