Added missing final modifiers

Tried to restore as many final modifiers as possible. 
Just wondering if we have a rule to force ```static final``` instead of ```final static```?