a bit of organization and sorted keys
added a bit of dynamism, reorganising & a bit of cached data