Better separation of concerns