Remove need for extra variables and add less specific undefined checks
Remove need for extra variables and add less specific undefined checks

mailvelope/mailvelope,mailvelope/mailvelope,mailvelope/mailvelope