addressing codereview comments