Improve modularity of code.