Updated structure to maintain clean presentation