remove prefix adn make DRY