Simplified a few things