Improve formatting

Source code formatting seems to be optimized towards a small number of code lines. This results in poor readability (at least for me).

Therefore the source code should be reformatted, preferable using a code style which is similar to the one used in Glencoe.

We should make sure the comments stay in correct lines. 