Missed refactoring