Minor refactoring of supporting methods