More semicolon insertion and some formatting