some more cleanup/documentation