Refactored field initialization