Refactoring: initial