Refactor: separation of concerns