Fix up code style