clean up code and names of args