Code base rework