Everything checks out, just refactoring/condensing