refactor and clean-up

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