Fixed Protecting Our Own and some cleaning...