Simplify and tidy server and auth interfaces