Incorporate comments from @daithiocrualaoich