Code cleaned and dependencies updated!