clean up code
add Werror compile issue