Changed a little code and deleted code unused.