Improvements from suggestions