Made the changes PeterScott suggested.