View cleanup

This should resolve #23