removed some comments/extra unnecessary code