Add option to switch title notification on and off.
Clean up code a bit