renamed function
changed argument position for consistency
renamed function arguments for consistency
refactoring to improve readability