Improves variable names, argument order