removed some comments and unnecessary code