New file headers. Some code cleanup.