simplification

simplified some usage