Simplified a ton of stuff