
        Simplify some code

4f2cf7c