renames args
clean up code