more refactoring -- support comma delimited params