random wacky cleanup things that make Resharper angry