cleanup per PR comments