Minor method refactoring