[#1511]Some formatting