Removing two more unused strings, and going back to clang
Removing more unused variables
extracted argument parsing into a seperate function