Fix bad indentation
Some more astyle
More astyle