Removing data structure from views

Much less smelly...

fixes #232