SLICE-2 Small refactor - final on class fields