- appying the code inspection fixes