refactoring.
clean up