refactor collection mapping
test code beautify
refactor