Fix expiration date encryption issue
Fix some weird whitespace issues