Some more poishing and pruning