additional improvements
cleanup