refactor
refactor
remove test
added key names
new data structure