Application of more feedback from @mrtiller