added and removed some comment