Improve the code even more.