A few small adjustments to clean things up a little
Naming things a little bit more clearly