Syntactic sugar

Changed the var names to be more uniform and understandable