fmt and move stuff around

Signed-off-by: Saggi Mizrahi <ficoos@gmail.com>