Improve code structure.