Use units consistently