Sprinkled the code with final
Minor cleanup