Refactoring: use static initialization