Typos, refined data preprocess ++