Minor tweaks (indentation, "final" for one of the constants.