fix whitespace, switch statements etc. #2951

This compiles and does not make any test fail. Will have to
look at RndSmoothCircleIC later to use a better Pi (test depends
on crappy Pi).