Refactor multi-line function calls