(defensive) switch convention, Form refactoring (3), tidy up