Astyle formatting cleanup