move definition closer to where it's used