more cleanup + fixed typo