help text update plus refactoring