Helper added

Some refactoring