Refactor to params style