More improvement on separation of concerns