Refactoring for simplicity