core: little cleanup