clean up + small fix