indent code with 'astyle -A4T4Oo'
more cleanup