* Eliminated (new) warnings
* Fixed indentation
* Removed excess blank lines
* Improved some varable names
* Removed (unneeded) commented-out code
* Fixed up comments
* Added @Override annotations