clustering fix, style changes