distributors - clean up based upon pull-request feedback (code format, etc.)