Starting to use final in member variables when appropriate