first stage of codereview changes
cr edits