simplifying
more cleanup