improved clustering a bit