update code style issues as feedbacks