Changed arg order
Refactored var names