Reformatted tabs and edited comments