cleared up some inspection warnings