cleaned up views