Minor refactoring of the method impl