refactor success