fixed bug: used value member instead of key object member
some beautifying ..