cardiff: Fixing more stylish issues