- fixed several stylechecker issues as well as the switch case block -