Code corrections on advise of Eclipse.