Improve the code standard