Code review to compile with -ansi