CLean up; Update file headers