Refactored cli parsing to use Commons CLI