refactord

Signed-off-by: mofo <fredrik@tjornfelt.com>