some extra comma/semicolon cleanup