Use better const name

And fix some minor style issues.
Use 1.9 style hash syntax where possible