[mod] refactoring, DRY