Code cleanup in ModelIO package