Address comments from @SuperJugy