Simplified a lot of stuff.