Code inspect: cleanup