Better help handling, refactoring.