Revamping code