Refactor success
Remove unnecesary variables