Shrawan : 7 August 2014 : Refactored Code