[codingstd] Fix cuddled else and missing semicolon