Simplified a few function calls.