Code cleaned by eclipse