Add help_text and refactor