Condense More Function Calls to Single Lines