REF A little beautification