Remove some uniq tests
Refactoring
Reindent the project with 4 spaces
Fix some execution bugs