Changed few code to be more aligned to the pattern.
Merge branch 'saurabh'