Improve modularity.