Good changes done to Raj Goel code
Lot of cleanup in Raj Goel code