Removing unwanted semicolon
Explicit folding markers for the times when needed