fix review issues from a-chumagin