cleaned comented code