Simple code reorganization.