Make validator instance variables final
Resolve TODO by adding clarifying comment