add space and refine the code style