restructured/refactored/reformat