Small refactoring to test initialization