Minor: Refactoring