cleaning up code
Adding xml parser
more clane up