Cleaned up a little, no special changes.