make code nicer