improve code change according to review)