readwrite: Stylistic cleanup