Consolidating some Common code to make more readable.
Merge remote-tracking branch 'origin/master'