Remove 'else' after 'return'. Fix formatting of a 'switch' statement.