Handle formatting properly