Update on code cleanup with Resharper 8