Fixed. More porting to use D style.