Correct formatting of returned parameters