refactoring
cleanup
major cleanup