Fix indentation
Another small formatting fix
Merge formatting fixes from branch