Created static data object vs. dynamic data object

Other cleanup as well