Changed formatting rules