Continued neatening up the code
Continued neatening up the code