Make it slightly more proper

A wee bit of a controller-view separation