Remove semicolons and normalize indentation