Tidy serve generation slightly