Tidy up Controller and View