Refactoring: made help and usage generation clearer