Re-order and clean up clustering

Re-order and clean up clustering