More formatting clean-up...