Helpers & config refactoring