Improvements from comments