docblocks and misc cleanup