More scoping and data formatting
More scoping and data formatting