Fixed tabs and other comments