multiple changes for brevity and clarity