Made things a little more cohesive