Not this PR directly responsibility, but would be nice add final on constructor fields