Make function calls more consistent