clean up code a bit
more cleanup + typos