Added StringBuilder when constructing key; cosmetics