Apparently I'm blind. (Refactoring)