Minor edits to minimize code for users not using the tray icon.