Fix codereview comments