small optimization
cleanup