Astyle -A8 and some extra formatting