Cleaning up code using eclipse.