clean + small fix