refactor cleanup
refactoring completed