Cleanup of static analysis issues from Code Analysis and StyleCop