removed some comments & methods