Code cleanup4