improvements of the code made in eclipse.