Code revamp