[FEATURE] Working on payment formatting