Fix formatting with astyle