fixed all tabs and removed some comments