Missed refactoring for #2