Cleanup docblocks and related things