a little more cleanup and consistency