Add expandtab directive; fix formatting