Simplified a few things.