Apply feedback from @JSkimming