Refactor ArgumentParser

Remove redundant long to short option mapping.