Make payment code more explicit