cleanup OW code
correct prototypes