Minor changes to code. Easier to read at expense of lines of code.