WIP: Try to refactor in the same style as Kasper & discuss with him