some modification about code style