String formatting clean-up