Updates based on feedback from @dp. Also eliminate a superfluous non-header header