Wizard - code cleanup & alignment to grommet standards

We should go through the Wizard code and make any cleanups and ensure it is consistent with our standards throughout the rest of the codebase.

• Review Wizard code and determine if additional cleanups are needed.

Anticipated effort: low (Wizard code is in pretty good shape, minimal changes expected)