and more refactoring
cleanup