Some refactoring and cleanup in the services/list controller.