Cleaned up code.

Just some routine clean-up.