improve the code style and make small changes
improve the code style and make small changes