Apply astyle 3 to whole code

This is a huge commit, applying indentation to the whole
code. Notice that this commit is made on master branch
after having merged with -s ours from branch v2.3

See #215