Too large functions

There are some large functions that need to be documented properly to get good overview. Dividing them in smaller functions probably improves readability of the code.