Cleanup. Update docblocks,