Cleaned up the code
Merge remote-tracking branch 'upstream/weka' into weka