Update files to reflect comments by malyshev