Add some more variables for clean
Fix ambiguity in checkout