app refactoring, improved help text