#1 Change coding style from linear to functions

[Lindqvist]

The code is currently very ugly in general. In particular, the linear programming style makes it difficult to get an overview of the steps involved in the conversion.