Cosmetics

Kind of untested though !