Additional clean up for Customer Authorization

Additional clean up for Customer Authorization.
Related to Customer Authorization is not completely checking customers_authorization #219