fixed docblocks

Also removed some extra whitespace.