More Code cleanup