Add comments
and delete unusefull function