refactor according code review #13