A few semicolons removed