Simplified a few methods.