clean up and got parsing done