Better separation of concern