Fix up coding style