indentation fixed (used AStyle with no options) plus few manual corrections