Minor refactoring

Signed-off-by: Nepetalactone <tobias.meusburger@gmx.net>