Consolidate things a little
More or less just trying to optimize this.