Better code reorganization