Collaboration: Code refactor.