Fixed formattin with Astyle