Merge refactoring and lint tool sections