Code cleaned pt1