Small refactor.. derp.