Adjusts semicolons issues and increases coverage