Doc block fixes

To keep my IDE from squawking at me all day. :)

I also killed a few lines of unnecessary code.