[UPDATE] Code cleanup