More progress rewriting data parsing and cleanup