more refactor
clean service