Refactoring to modularity