A little bit of cleanup and helping the classes self document a bit better
through clearer property names.