* Refactor help code and improved output