"Improve" previous commit