cleaned up views pre-presentation