Style, typo, header, coding conventions fixes