Minor improvements after reviewing with @theJP :)