Refactor clean modularity