Continue refactoring
Continue refactoring