Roundabout construction to wrap up by end of year