Updates as per review; also use common methods in pull 600