refine targets to be more consistent