Minor updates for consistency.
Cleanup Servers controllers.