Refactor for parameters