Tweak DocBlocks, reorder methods