changes scopes in helps, some refactoring