Minor changes, removed some comments