Housekeeping

* Removed unneeded or replaced methods
* Added comments where needed
* Formated comments where needed