Identation of folded expressions.
consistent #includes, some formatting