Refactor: final fields
Refactor