Cleaning things up

* Removed existence checks for properties (properties are undefined by default)
* Cleaned up some variable names
* Move deprecated methods to the bottom and clean the logic up