Cleaning up the returned args