Eliminate unused local variable
Eliminate unused local variable
Add/Fix docblocks