Revert "mshah - refactoring"

This reverts commit 9e8f8e863648a3da07db5c523b1167cef2a9f0bc.