Some of this probably needs to have another pass to match coding guidelines (bool versus var, line length). But I think it's fine for it to be this way for now. You could do that as a separate PR once we get @rynowak's StyleCop changes working.