LINT build test. Aggregated source code adjustments to bring most of the