Performing some editorial improvements suggested by STL