Removed some old lines of outcommented code and made some somments on how some methods works