cleaning up the code and remvoing Eclipse files