Refactor business workflow