Parsing - Step 3

Cleaning, Enhancing.. And keep fixing, but still have a lot to do..