[CLEANUP] Code cleanup