Fixed Customer namespace problem
Minor cosmetic changes