Extract the production source.
Improve tests, +readability.