Tabifying to 2 chars and some comments