remove some code which is not necessary to pass the previous tests
Correct the wrong case name
refactor to remove some duplication and add some domain concept