deleted .java~ & minor modifications