cleanup
some minor change