Fixed Code Inspection warnings