renamed StateViewMixin to StateMixin + some cleanup