Improved formatting of Services