Fixed defaults in case/switch statements and minor style fix