simplify
more simplify
fix check file
Merge pull request #3 from chemist/master

Refactoring