Ton of cleanup and minor fixes (thanks ReSharper!), plus an improvement on AppData