Refresh refactor

refactoring application