Clean up
Clean up
Clean up
Fix function optional arguments when using single-quote strings ('/arg')