Cleaner calling code