more docblocks and cleanup