initial checkin of refactor code , Dev Task : CSH-1156