Code cleanup3