Swapped const to field/final