Editorial improvements from STL