Fix a bug preventing the use of "/" as an argument and clean up code