Refine code style and comments position