Refactoring:
* parameter parsing

Amendment:
* Usage display