Changes suggested by Andy

As suggested by @ahb108