Minor tidyup (add semicolon, remove trailing commas)