cardiff: Code Visual improvement