Removed commented-out code
Refactored method names, added documentation