cleanup + small fix