First steps in order to make analysing tools more flexible.
Reformatting.
Refactoring.