smaller improvements

Signed-off-by: Christian <christian.szczensny@voltimum.com>