* Cosmetics and header consistency