Update spacing and formatting to match existing style