style changes; refactor customer service