Refactor to separate concerns better.