fix bug on C files
remove sysout
code cleanup