[Issue #1730] Minor refactoring / reformatting