naming issue
cleanup - keep it thin and straight 3