Further style improvements