#47 final tidy up