Fixed saved settings message; Code cleanup minor