CODE REVIEW comments added to multiple files