Refactorings and help text