Fix spacing and formatting in server