Refactor wallService in 2 services