Address @monodo's comments