cleanup stuffs
fix some hints