just moving forward with some refactoring