Enhanced formatting