Few cosmetic changes, I hate WCF.