Fix minor bug on argument parsing
Remove unresolved symbol
Cosmetic changes