#460 formatting