Resharper cleanup
 - Removing obsolete (commented) code
 - Renaming for added clarity