#58 final tidy up