Polished some comments
Fixed tabs