Cosmetic cleanups and use 'case' in params