Simplified the customer and customer address entries.