refactoring / granularity / scalability