polishing code style