Code cleanup/standardization, moved header text