Revert "simplifying keys"

This reverts commit 61b40e8501c35b5295800cc7575575554d3e48cd.