Started code cleanup - source headers