Improving usage message

- Also some unused code deleted
Merge pull request #14 from anallely/master

Improving usage message