Cleaned up targeting stuff a bit