cleaned up source headers