Make switch check more explicit
Fix the regex checking for class definitions #47 - 3