better code organization, added cluster attributes