Minor changes to organization and data structure use
More minor changes