more cleanup, making some things consistent