Refactoring + comments (#124)
Fix checker tests