Fixed multiline returns, made them more readable