Removed unnecessary calls.
Fixed wrong docblocks and removed one unused argument.
Removed unreachable case branch.
Stylistic changes.