Fix constants and style tweaks