cleaned-up the class

* alphabetized methods within the class
* removed outdated use statements
* removed/added/editted comments
* added line breaks to code that is > or close to 100 characters

Change-Id: Iff5c26188cc0584e623ba8d1b498df5331c2d281