little performance improvements
cleanup