improve the code style