Improve code separation