Reformat with 'astyle' for uniform style