Just code cleanup and functional decomposition.