Refactor code, easier 'new Wadoku' feature.