Applied comments from @xabbuh