Updated Formatting & Structure. Validated