Additional cleaning up.

Neatened the code some more.