Minor code cleanup. add header.