[PATCH 1/3] WIO: code cleanup