templating and style
cleaning up style