[REFACTOR] Clean up pattern for getting params