Cleaned up some code.

Some minor cleanup - Still need to clean up the file a bit more.