Removed test which is really only personal testing code, not a proper automated test
Switched to a code style that terminates all statements with semicolons,
and slightly reformatted long switch-case blocks