Improve minor details