Added more formatting rules