Cosmetics + code coverage