Improve a bit