Touched up the code. Mainly cosmetic changes.