Address @simonster's comments