Changing 10/29/2014
Fixed all code smell with resharper