Cosmetics + documentation