Refactor codes
Start to use wantit module