responed to @irskep's code review