Cleanup and docblocks.