Code cleaned and initial release