Refactor business