making code nicer, according to C99