Stylistic cleanup phase 1: cstyle