refactoring and moving forward