Fix #115 refactored keys to be more readible