Improved some areas that could be confusing or contentious