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: I6849a2909b63a890b7c76a44a57a79934c4ec885