start refactoring our code