matrix: Stylistic cleanup