Improve Server formatting