Refactoring here and there
Refactoring
simplify introduction
Remove debug codes