overhauling code