Overhaul code-base