Replaced conditional with guard case.
Removed commented out code and updated docblocks.