clean-up and reorder methods according to fields of responsibility

Signed-off-by: Florian Thienel <florian@thienel.org>
1 file changed