Improve a lot of code.