Minor stylecop changes