Code Revamp