Small rework

Signed-off-by: mat tso <mat-tso@topmail.ie>