use C99 to cleanup code