Finished cleaning up code. (Again only cosmetic changes.)