[RFR] Code cleanup