little cleaner target logic