Doc and better variables