Simplified a few more things