Restart notifications
Tidying server-side functions