cancro: bit more cleanup and include wifi module