some more cleanup and consistency