clean up code base a bit

avoid some warnings with Wall.