update

made a few code changes to keep resharper happy.