Refactorings. Make Key more efficient