NOBUG formatting improvements