resharper pass to clean code up