Address @kvark's review