Fix formatting + remove ununsed imports