Address @coderanger comments