[83041740] Better separation of concerns