Improve help message generation