Many small improvements

...instead of class names (if possible), final parameters/variables, etc.