Improve the code.