cleanup, use C99
cleanup, use C99