Updated style
Updated structure