Improve statuses in paypal, refactoring