Update per PR suggestion