Revamp code.