#675 - Removing CTidy from this PR :)