Refactoring. Trying to separate concerns of objects.