Refactoring, switched method ordering (git diff makes it out to be a really big thing, but it's not)