starting code cleanup