Cleaned up the code. Updated eclipse project file not to use
specific version of java.