Refactor params