Rename some variables
Add option to return as string