Some cleanup and a new header!