Re #922 Improving code quality...