addressing codereviews