yet more cleanup
consistency