Base: Minor refactoring