Simplified the whole set