Improve the coding