Colon reformatting: Fixed some cases with inheritance