Improve utilities logic and names.