removed redundancy in key names