Started code cleanup