removed C99 constructs