Optimization, minor wording changes