Cleaned up WLDataModel.java.