Refactored field in code