removed unnecessary object references in some keys, small refactor.