#5 remove unnec' comment and typedef