Refactoring

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>