Style, header and functions changes.