Suggested @bkerley edits