cleaning up/organizing clustering