Refactor all things params