Address feedback from Alex Gaynor