make code less awful