Refatoring.

git-tfs-id: [https://tfs.codeplex.com:443/tfs/TFS15]$/Atomix;C41514