Cleanup code errors - good first push to printer.  switch test passed