Cleaned up resharper code reduncancies