Cancro: bit cleanup
cancro: bit more cleanup and include wifi module