*sighs* lack of follow through on refactoring