removed some comments
Fixed generic identifier bug