Some formatting enhancements