fmt cleanup