make code less stupid