massive docblocks cleanup