Fixed tabs and comment