Refactor for better help formatting