Sanetize formatting

Formatting of Elf was a mess. Now it should at least be somewhat consistent.