Removed cruft.
Refactor private property names.
Refactor.
Refactor.
Refactor.