Further extraction of methods

As there are large method bodies, I wanted to decompose those methods
into smaller parts, with meaningful (to me) names.