slight optimization
cleanup
typo