Fixed most cpp lint warnings