Simplified a few more spots