Removed unused var
Fixed docblocks
Replaced variable with equivalent variable. No functional change intended
Whitespace