Code cleaned & sorted